Fix xenconsole when console page is >= 4GB.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c b/linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c
index 154b0c735494e411abd4e68462b693e3176dc127..c93f2bc55152298cfe2de405ef09d041c21c2409 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c
+++ b/linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c
@@ -36,13 +36,12 @@ struct ring_head
 
 static inline struct ring_head *outring(void)
 {
-       return machine_to_virt(xen_start_info->console_mfn << PAGE_SHIFT);
+       return mfn_to_virt(xen_start_info->console_mfn);
 }
 
 static inline struct ring_head *inring(void)
 {
-       return machine_to_virt(xen_start_info->console_mfn << PAGE_SHIFT)
-               + PAGE_SIZE/2;
+       return mfn_to_virt(xen_start_info->console_mfn) + PAGE_SIZE/2;
 }
 
 

diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/page.h b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/page.h
index 788aa0637ba802c16d17aa4483d06e67b53f5074..098de998c0d55e4d3403b3ae5db53590432a3111 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/page.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/page.h
@@ -261,7 +261,6 @@ extern int sysctl_legacy_va_layout;
 
 /* VIRT <-> MACHINE conversion */
 #define virt_to_machine(v)     (phys_to_machine(__pa(v)))
-#define machine_to_virt(m)     (__va(machine_to_phys(m)))
 #define virt_to_mfn(v)         (pfn_to_mfn(__pa(v) >> PAGE_SHIFT))
 #define mfn_to_virt(m)         (__va(mfn_to_pfn(m) << PAGE_SHIFT))
 

diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/page.h b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/page.h
index fd7a675488b39af89109719d311ad6323da694ab..242d5b21ac4a0d83e7046814c02a3a3d8d111c5a 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/page.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/page.h
@@ -239,7 +239,6 @@ extern __inline__ int get_order(unsigned long size)
 
 /* VIRT <-> MACHINE conversion */
 #define virt_to_machine(v)     (phys_to_machine(__pa(v)))
-#define machine_to_virt(m)     (__va(machine_to_phys(m)))
 #define virt_to_mfn(v)         (pfn_to_mfn(__pa(v) >> PAGE_SHIFT))
 #define mfn_to_virt(m)         (__va(mfn_to_pfn(m) << PAGE_SHIFT))